ERROR: null value in column "ar_deleted" violates not-null constraint in /var/www...

- coalesce NEW.ar_deleted in archive_insert rule, because MW might not specify it and the default doesn't take effect

diff --git a/maintenance/postgres/archives/patch-archive2-ar_deleted.sql b/maintenance/postgres/archives/patch-archive2-ar_deleted.sql
index e05459c..3c59fd1 100644 (file)
--- a/maintenance/postgres/archives/patch-archive2-ar_deleted.sql
+++ b/maintenance/postgres/archives/patch-archive2-ar_deleted.sql
@@ -12,7 +12,6 @@ CREATE RULE archive_insert AS ON INSERT TO archive
 DO INSTEAD INSERT INTO archive2 VALUES (
   NEW.ar_namespace, NEW.ar_title, NEW.ar_text, NEW.ar_comment, NEW.ar_user, NEW.ar_user_text,
   TO_TIMESTAMP(NEW.ar_timestamp, 'YYYYMMDDHH24MISS'), 
-  NEW.ar_minor_edit, NEW.ar_flags, NEW.ar_rev_id, NEW.ar_text_id, NEW.ar_deleted
+  NEW.ar_minor_edit, NEW.ar_flags, NEW.ar_rev_id, NEW.ar_text_id,
+  COALESCE(NEW.ar_deleted, 0) -- ar_deleted is not always specified
 );
-
-

diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql
index 8777aa6..10ca78f 100644 (file)
--- a/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@ -152,7 +152,8 @@ CREATE RULE archive_insert AS ON INSERT TO archive
 DO INSTEAD INSERT INTO archive2 VALUES (
   NEW.ar_namespace, NEW.ar_title, NEW.ar_text, NEW.ar_comment, NEW.ar_user, NEW.ar_user_text, 
   TO_TIMESTAMP(NEW.ar_timestamp, 'YYYYMMDDHH24MISS'),
-  NEW.ar_minor_edit, NEW.ar_flags, NEW.ar_rev_id, NEW.ar_text_id
+  NEW.ar_minor_edit, NEW.ar_flags, NEW.ar_rev_id, NEW.ar_text_id,
+  COALESCE(NEW.ar_deleted, 0) -- NEW.ar_deleted might be unspecified (NULL)
 );
 
 CREATE RULE archive_delete AS ON DELETE TO archive